Fill in color fields to black for transparent colors since we'll later

Tue Dec  4 11:45:45 2001  Owen Taylor  <otaylor@redhat.com>
	* io-xpm.c (pixbuf_create_from_xpm): Fill in color
	fields to black for transparent colors since we'll
	later initialize pixels from them. (Fixes purify
	errors, #66093, HideToshi Tajima)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 75853d2427889e05754694a081aa55decfa4a8eb..1ffdffc86edcde3b4d485b822d64479452fd16b6 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec  4 11:45:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * io-xpm.c (pixbuf_create_from_xpm): Fill in color 
+       fields to black for transparent colors since we'll
+       later initialize pixels from them. (Fixes purify
+       errors, #66093, HideToshi Tajima)
+
 2001-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * gdk_pixbuf.def: Add gdk_pixbuf_get_option.

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index b18a82e640c6f6fa81e443939af420c8f3753df1..3efb4324a039d2faa85a709d49ab899235f97773 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -1300,6 +1300,9 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl
                if ((color_name == NULL) || (g_strcasecmp (color_name, "None") == 0)
                    || (parse_color (color_name, color) == FALSE)) {
                        color->transparent = TRUE;
+                       color->red = 0;
+                       color->green = 0;
+                       color->blue = 0;
                        is_trans = TRUE;
                }